really move the GtkType typedef to an undeprecated section.

2008-06-17  Michael Natterer  <mitch@imendio.com>

	* gtk/gtktypeutils.h: really move the GtkType typedef to an
	undeprecated section.

svn path=/trunk/; revision=20429

diff --git a/ChangeLog b/ChangeLog
index d1bf575124ee616382c83599aa407ea117c770a4..a4a73f5d624d4e7f3d4fe60fc05f80b2865bb8b0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-17  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtktypeutils.h: really move the GtkType typedef to an
+       undeprecated section.
+
 2008-06-17  Michael Natterer  <mitch@imendio.com>
 
        * gtk/gtktypeutils.h: deprecate GTK_CHECK_CAST, GTK_CHECK_CLASS_CAST,

diff --git a/gtk/gtktypeutils.h b/gtk/gtktypeutils.h
index 4333ceedef9e87569bbb29626d38b399aa262e99..1c8aa558d319a04c08a7b86f47b6222aa51d5330 100644 (file)
--- a/gtk/gtktypeutils.h
+++ b/gtk/gtktypeutils.h
@@ -95,6 +95,8 @@ typedef GInstanceInitFunc     GtkObjectInitFunc;
 
 #endif /* GTK_DISABLE_DEPRECATED */
 
+typedef GType                   GtkType;
+
 G_END_DECLS
 
 /* Builtin Types
@@ -136,10 +138,6 @@ typedef GSignalCMarshaller          GtkSignalMarshaller;
 
 #if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
 
-/* glib type wrappers (compatibility) */
-
-typedef GType GtkType;
-
 /* Used by gtk_container_foreach_unmarshal () */
 
 /* GtkArg, used to hold differently typed values */